lisp/server.el (server-start): For compatibility, revert part of revno 101688.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index debe2f0a29c97a0cf76bade172991b288fa5b6af..23d7619ae368902d7267752a71ca2c0e5c4b6a04 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-01  Juanma Barranquero  <lekktu@gmail.com>
+
+       * server.el (server-start): Revert part of revno 101688.
+       Let's not break compatibility gratuitously, shall we?
+
 2010-09-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * net/tls.el (tls-starttls-switches): New variable.

diff --git a/lisp/server.el b/lisp/server.el
index 87250fd3aaf9537f8df36dd6862f5e524d35e322..0f1b0219a2c75011f5a5a2d33e569e5d7552b00f 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -586,6 +586,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.")
                (setq buffer-file-coding-system 'no-conversion)
                (insert (format-network-address
                         (process-contact server-process :local))
+                       " " (number-to-string (emacs-pid)) ; Kept for compatibility
                        "\n" auth-key)))))))))
 
 ;;;###autoload